Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Feb 2012 18:58:48 +0000 (10:58 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 10 Feb 2012 18:58:48 +0000 (10:58 -0800)
commitf3b061511c191a6a40b7f0466702c850dec8f5f6
tree37c5366cef6676ef3695536246a0cc14eb370e08
parent236b637fc00aa14128417a9b9bb80e72bf209795
parentd25e159fad2571902feaee341ebb796ea2c1aa84
Merge from trunk.
22 files changed:
src/ChangeLog
src/buffer.c
src/callproc.c
src/character.c
src/coding.c
src/dbusbind.c
src/dispnew.c
src/doc.c
src/eval.c
src/floatfns.c
src/fns.c
src/gnutls.c
src/image.c
src/keyboard.c
src/lread.c
src/minibuf.c
src/process.c
src/search.c
src/window.c
src/xdisp.c
src/xfaces.c
src/xterm.c